More fixes
Added xref dependencies