Address more sonar issues in policy-models