fixes for sonar vulnerabilities