SONAR-5209 Some fixes