SONAR-4884 Small improvements and bug fixes