Minor changes as a result of integration testing.