couple of fixes

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