Fix build and fix buttons check

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