More build error fixes

Signed-off-by: Rashed Abdel-Tawab <rashed@linux.com>