cross compilation fixes
4 files changed