Fix the vars.