More niceties

Change-Id: I8d89e84c7776a5f4fba8034c69e4a10a767d116f