More clean-up for cross-platform