fix up proxies and public keys