Improve building on Windows.