Some bugs relating to reordering.