Some sonar fix