Fix vars structure.