Normalization improvements