Add support for CMSMS 1.11<br />Minor bugfixes