Fix capability negotiation