Sierra fix xrefs