Correcting wrong vars in Opt-in, Expedient and VTAM