Fix compile errors

Change-Id: Ia63796c39e71b7eb43ce09bb7eba604baaa67f47