more more handshake fixes