Add in proxy client support.

Fix a bug in unsubscribing.