Some fixes related to final testing of 2.1 on Windows.