Additional Linaro changes