O3 and Linaro 4.10 fixes