fix compile errors

Change-Id: Idc0568365ee859447996bb0c40a3e45bc793693d