Fix a couple of cppcheck findings

There is so much more to fix.

assigned to @oliver.sander

mentioned in commit 95c31d3f

merged