Improved cross platform support.