Improve handshake reporting details