Fixes for CMSMS 1.11