Robustness fixes for KEXINIT handling and others. In particular, I've