Fixes

Change-Id: Ib91d687d63887a4b2dd38d43a920b701409ad6a9