Fix most sonar issues

No match.