tweaks

Change-Id: Ia9edba290a2bf7f628f31a28774328c88d2ae7fe