Minor changes for full passing test suite on Windows CI servers