minor changes in OrderManager