Fix sonar issues and reporting

No match.