Some fixes sonar