Bunch of v3 changes to match updated mocks.