Resolve all issues os undefided vars