small bugs fixed in Delivery