DF Some fixes in delvieries.