Fix Major sonar issues