More build linaro fixes