Minor Tweaks

Change-Id: I683ce6d4851709eb8c433ed2df88fc6834c4711a