Fix linaro problems