Improved Windows compatibility.