Fixes for CMSMS 2.3