Correct issues from sonar