SONAR-4406 Some minor improvements