Fix iVars