Bug fixes for CMSMS 1.11<br />Various minor bug fixes