Orphaned links fix