More fixes highlighted during testing.