Fixed SonarQube issues.