Minor changes

Change-Id: Ic86a37a678648b0ab2facac3e55f54067124657e