Fix bugs in Calibration mode