More changes from integration testing.