More SONAR fixes