Sonar Violation fixes