Fix up some references