Few issues on first day back with CMS

Few issues on first day back with CMS