fix Linaro build errors
fix some more Linaro errors