Minor tweaks

Change-Id: I725e37d8bde792a65fa23374e40b07eb2512f089