Sonar issues improved