corrections for cppcheck