fixed some more sonar issues.