Changes to zscore calibration heuristic