Even more sonar fixes.