more fixes

Change-Id: Ic55d94ef69b6b8ea4ec2a6df708a9444e9d5f4e5
2 files changed