cosmetic fixes

Change-Id: Ic42a385c98fb0db109cbce25cc5572621125522d