fixes to rpcserver