Fixes for Proxy backend.