Fix various integration test failures