CMS Manager Fixes