Minor tweaks

Change-Id: I0755a888949c116ebdf26b698b432d27ee0dd1a1