Minor changes recommended by cppcheck and clang++