Minor updates to modern standard
Should now work with CMSMS 2.0