Fixed scale issues in calibration