more linaro fixes