Minor changes for calibration routine