Fixes to RPCs