More RPC changes for SP

same as above - will amend