Fixes

Change-Id: Iae3fb0a70bd0e73865e42193a2673872905b4e3d