Minor bug fixes, particularly for CMSMS v2.3