linaro fixes (2/2)