Fixes

Change-Id: Ia011dc988225ce12795d7a038a8fc7a41341b873