Small tweaks

Change-Id: I57709b9a87a7c83cdd46afa629ff46108fd50865