SONAR-4851 Some fixes