Resolve some issues that were raised in SonarQube. Most of them bogus, but some good suggestions as well