Fix Sonar vulnerabilities