Minor fixes - particularly for CMSMS 2.3