Further sonar fixes.