small fixes

Change-Id: I87014f3d6943b5cb35a59ba299ac44dc1acd3d33