Commited missing updates to rpc.R