calibration fixes