Sonar Violation Fixes