Fix client vars in instance_com