Fix build errors

Change-Id: I64b73c41a87b8dec5b5288de1378e91ceb0406fc