Correct cppcheck warnings

Refs #10672