ContentEntityNormalizer fixes.