Minor changes to process_delivery