Some changes

Change-Id: I2a5f67983dbcebaf22e563aa9af08ebc29d2c474