Couple of changes from RPC