Sonar sensor fixes