Fix ups for cross compiling