Fix most sonar issues