SONAR-5333 Fix some issues