Fix build errors

Change-Id: I2432936707d35b5040ee4425244aad2c16b20820
Signed-off-by: Rashed Abdel-Tawab <rashedabdeltawab@gmail.com>