Small changes to match last version of calibration_common.