various tweaks

Change-Id: Id51cc309a8687ac7f5d7365703730657b462539f