Somes Sonar fixes