minor improvements

Change-Id: Iceddd80836b3c29ad8b65cb2c00d5d6a504ca434