Further Linaro 4.7 fixes