Fix sonar reported issues

Merge request reports

Loading