Fixed more cppcheck warnings
More cppcheck warnings