fixes for linaro