More fixes

Change-Id: I2b5581e08b6e2414f4af62f499d235596951d09d