Fix xref checks #27