Some more tweaks

Change-Id: I85496f46b22b3a73bc98c22358d2f0ad865b9012