Fixed calibration issues