Sonar issues behoben.