Minor RPC fixes