Improve multiplatform support