Fixes for downstream tests in RPC.