RPC client/server fixes