small fixes

Change-Id: I2ef09c4cee239b6ad620e264d9b645456a0342d3