Fixes

Change-Id: If89c0b88abc001a8996d1314adb68196ffb7939b