Minor changes

Change-Id: I84fc73b5450a87b1e4598058ce0257eb6426635a