Item12952: various bugs highlighted during testing