CMS/settings bug fixes