cppcheck performance fixes
Wreorder fixes