Fixes

Change-Id: Id8dae5df9e233d2e9b75d08d08bbe7ed55d16af3