A couple of integration test fixes.