Added fixes to response negotiation