Minor bug fixes (particularly for CMSMS 2.0.1)