Fixed bugs in DeliveryService