More fixes to normalization