hopefully the last refinements for correct type conversion in calibration

No match.