Some tweaks

Change-Id: I5897a0b9d101f08d7f76e99ffa5824357a8d1417