Fix major sonar issues