Sonar fixes

Sonar fixes