fix issues sonar