Additional changes

Change-Id: I2043ef90ddc2eaf7f81b77836d21ac05638c0963