A few changes

Change-Id: I3341e2d824d9e66a73623c920bd0620de91a2fb4