Fixes for CMSMS 2.3+<br />Fix notices