Fix dead-letter warnings