CMS fixes