Correct errors that only showed up on windows.
Merge branch 'windows_testing_errors'