Fix sonar issues and reporting