linaro fixes (1/2)