fixed more sonar issues