A few more tweaks

Change-Id: I8f2e2d8fa564309128540af528cbc381aa0b7e5b