Even more fixes from Sonar.