Compatibility fixes to support CMSMS 2.x