Minor fit and finish issues

Change-Id: Iff5d8e8ffe908122fd7c1e1bdee382c2ef83ccb3
3 files changed