Fix Linaro GCC 4.9 errors

Signed-off-by: Kostas K <mpokwsths@gmail.com>