normalizer fixes