Some cppcheck cleaning