Fnal retirement and VO fixes