linaro 4.8 fixes : thanks @flar2