Improved Windows support.