more build errors

Change-Id: If50a6169dfad0b33702ebe92e2721b501f559759