Linaro Compile Fix