minor changes in both proxy and client