Fix up some old references