Another fix to id and self-link.