Proxy and Email Fixes