cross-platform build issues fixed