Fixes for initial build

Change-Id: I0306256b12abae3226bd859899a0bae44d5b274c