Fix for SonarQube warnings.