Fixes for CMSMS 1.10.x and 1.11