Minor bug fixes wrt CMSMS 2.1