Further CMSMS 1.8 and 1.9 compatibility fixes.