Improved messages around calibration