Fix large reorgs