DF Some fixes in deliveries service.