More warning fixes.
Small fix for `FREE` wrong variable.
Merge pull request #4716 from dumganhar/warning-fix

More warning fixes.