Minor bug fixes.  Including some fixes for CMSMS v2.3