Fixes

Change-Id: I2e902655b82324eb7045b12319156906cb79ed20