Calibrator fixes