Some minor changes to fix build

Change-Id: I404f1cf25e62d865f443069352811388b3bc6f14