Small updates to OOCalibration