Fix up references