Fix a couple of cppcheck findings

Christoph Grüningerrequested to merge
feature/fix-some-cppcheck-findings into master

There is so much more to fix.

Merge request reports