Fixes to cross-platform compilation