Improvements for building on Windows.