Linaro fix ups