Fix xref and link issues