RPC/Redis fixes