Further sonar fixes