More fixes

Change-Id: I2ce557af6b15332c98b02f018f6b0d82b1dda304