Resolve sonar violations