Reorder some operations