Improved Windows support