Corrected issues with calibration