fix some code

Change-Id: I2436a664c65ec7fe1f826f5b5f1481e499ec5ddd