Changes needed for cross-compiling