More improvements for proxies