Minor bug fix and compatibility issue with CMSMS 2.2