Numerous fixes for CMSMS 1.11 compatibility
Forge Rules compliant