Fix Sonar Problems.