ENH: Auto calibration table fixes