Fix Sonar violations.