Fix content entity normalizer and other fixes.