Build fixes (Still not ready)

Change-Id: I0e9b15ed8833223bf66aeaa7171a4903d1bef6d7