Another fix for xrefs