Proxy client fixes