Linaro GCC 4.9.1: fix compilation errors

Signed-off-by: flar2 <asegaert@gmail.com>