Several adjustments on EoL export procedure