Fixes to proxy.