Fixes for CMSMS 1.10