Sonar Violations Fixes