Fixes

Change-Id: Icf88a057c7efdfea4c7294658d7d84b8d9b27267