some minor fixups

Change-Id: I59ebba914ba3386036e18c5d3abdc5f53570c338