Improvements to calibration procedure.