Fix integration test errors

This only fixes errors, not failures.