Fixes for Proxy errors.