SONAR-5331 Fix path issues