Cppcheck fixes

Merged Jan Möbius requested to merge cppcheck_fixes into master

Merge request reports