SupplyOrder fixes