Fix compile errors

Change-Id: I00525545e30f3c67f1a2dcd2b516837a83b2dc72