One last round of 'major' sonar fixes