Repair pseudo-variables