Minor changes

Change-Id: I49dc4ec5f675b354cf6deadc8a86f3c462f45361