minor updates ready for new rpc client