Linaro 4.8 fixes