Minor changes to cross-platform support