A couple of updates to fix some minor cross compiling issues
4 files changed