Plug a few holes in the proxy