Commit a bunch of fixes for Windows.