Improvements for Windows