Fixes

Change-Id: Icf6b2c0cb0a636f4767d061b967b00f1f5e6fa33