Delivery type association fix

I might need to fix other associations as well...