Fixed a few more sonarqube violations

2 jobs for master in 52 minutes and 10 seconds (queued for 3 seconds)