Protocol negotiation fixes