Fixes for CMSMS 2.3+
Fix notices