Some small updates/fixes for CMS-Modules