Minor bug fixes - Mostly for CMSMS 2.3