Numerous fixes for CMSMS 1.11 compatibility<br />Forge Rules compliant