Fix SonarQube errors
Release v0.6