some more sonar fixes