Fix new sonar vulnerabilities