Fixed sonar major errors