Fixes for CMSMS 1.10<br />Fixes for some minor reference inefficiencies.