fixing issues in Delivery models