Fixes for integration test failures on Windows