some fixes in sonar and sonar blue