some more tweaks

Change-Id: I04323c3bc15bbe5aec0fe47e518671423c271b0b