Fixes

Change-Id: Id36496aa8f26b78acb8ba70f3f50837a94f1fb7f