Fix cppcheck performance warnings 36 & 37