fix more build errors

Change-Id: I42bb37ed453d44e2bf397bc1bcfcd928243be1bd