Minor changes

Change-Id: I33c0437fe9480a841bcf961e3bdf4a744e3960b7