Some fixes to delivery logic