Improving Multi-Class Calibration through Normalization-Aware Isotonic Techniques