small tweaks

Change-Id: Id9e1c87599624849f14ff6bade8d4dbe47c6576c