Minor fixes; fixed email functionality in CMSMS 2.x context