More stable order cancellation upon exit
updates