Sonar issues fix.