More xref tweaks