And a lot more

Seems linaro ones need fixing too