Fix Sonar security vulnerabilities