Fixed sonar problems
Fixed sonar problems