fixes to build with linaro