Fixes sonar issues in CMService