Fix sonar in policy/models