DF Some fixes in delivery report.