Fix up retransmission bugs