Minor tweaks

Change-Id: I70a9ff2e8c21b7df616482aeb885aa2383366c11