More sonar changes.