Missed some cppcheck items.
4 files changed