More RPC changes for SP

Badly commented tho ha