Address sonar issues in policy-management