Several minor fixes and improvements.<br />Mostly type checking and stuff but a few issues for CMSMS v2.3<br />