Address #385: xrefs to potentially secure origin