More Proxy fixes (attempted)