Fix service_rpc blocking