Tweaks to order processing to be more resilient
wq