More fixes

Change-Id: I24419943866fd04acc6402decdd5671ec5ebcac9