a couple more tweaks

Change-Id: Ie17d470a43bab6592c87b9c7b6b1395fec64b44e