Added more cross-compiling support