#114: Fixed Calibration validators