Minor changes: attempting to fix Proxies.