Fixes for Linaro