Slightly improved cross-platform support