Further (and final for today) Sonar fixes.