Fix an issue with dead drop and add more logging