Address sonar issues in policy/models