cppcheck-1.58 fixes

Fix a few unitialized var issues reported by cppcheck-1.58.