Fix sonar and coverage