Updates for oga's comments (rpcserver.go)