Various fixes

Spotted by SonarQube.

I have analyzed HikariCP on our private instance. I asked the SonarQube people to add HikariCP to their public instance Nemo: I'll let you know when it's done.