Improved calibration data detection.