Fix errors and warnings in SonarQube. Every now and then we introduce bugs and warnings that can be removed or fixed. It is now time to include a patch for some of these issues in our next release.

This is a minor and cosmetic issue, but that can generate regressions or bugs.