Small code fixes for Windows.