Fixes for the proxy code