Small fixes for retransmissions
Another batch of small improvements