order processing fixes