Code fixes based on the proxytest