Some fixes for Windows.