Some small changes involving proxies