Bug fixes
CMSMS v2.3 compatibility