more build fixes

Change-Id: Icf2422a4a4bbec92caf0c65a8f6d2ac90b3abe15