Fixed several cppcheck warnings disabled c++98 builds
This will create a new commit in order to revert the existing changes.
