Fix order cancellation, notification bugs