Fix some error

Change-Id: I35ddcb53b7902d3f60ba55213cfe00beffaa7318