Fix up references.