Add missing Old* stuff for v58