Some changes to fix integration testing on windows.