Minor fixes for previous 2 commits

Change-Id: Ic1defe31c1c795594eae5eb0bb3df411e7c33360
Signed-off-by: Scott <scott@ubuntu>