Unset current after deleting order
Misc fixes