Small tweaks

Change-Id: Id8fc57f94ff11fa2c00b259aed2dec0569db531e