Fix up references again