fixing more delivery-mode properties