Minor updates to consumers/proxies