Minor fixes for Windows.