CMS field fixes before adding real content