Proxy fixes