RPC loading: tweaks.