Fix variables