xref fixes