Fixes for inital build

Change-Id: Iecb888a90deea7f8fd4c177694c781f4e9545cb8