Sonar improvements