SONAR-4851 Some improvements