minor fixes in calibration