Some more sonar issues