Cppcheck fixes

Jan Trávníčekrequested to merge
cppcheck_fixes into master

Merge request reports