CMS build continues. Minor tweak to the loading of plugins