Linaro 4.8 fixes (thx@nikhiljan93)