Some minor reordering