Dme2Client sonar fixes