[Proxy] Tiny fixes