Sonar improvements.