Fix sonar issues :