Missed some cppcheck items.