More RPC changes for SP