Temp compile fixes

Change-Id: I84385b2c8dec48d125bfc8a4619b277fd45cf823