Fix integration test failures