Explicitly type some handlers
A try at fixing retransmissions