SONAR-5620 Minor fixes