Fix sonar issues on policy-models