Fix Sonar issues
Fix Sonar issues