Fixing errors Sonar