More for sonar.... minor changes.