fix some errors

Change-Id: I167d051c340012a32662f000528b13a0337a6449