Fix cppchecks

Merged Jan Möbius requested to merge fix_cppchecks into master

Fixed several cppcheck warnings disabled c++98 builds

Merge request reports