Connection retry fixes and handle deletion messages.