Fixed Proxy Issues