More sonar coverage tweaks