fixes for CMS stuff