More CMSMS 1.10 fixes.