SONAR-5209 Fix small bugs