fix compile errors

Change-Id: I7be59a3db283ad6d46bd9458ce3d35e522488ee4