Fixed various sonar issues