minor tweaks for more compatible CMS additions