Fixed Proxy handling for v2+ protocol