Fixed more cppcheck warnings.