Some calibration fixes