Calibration enhancements