fixes for handling multiple protocols in handshake