Fix sonar issues in policy-api