Fix network api calls

Can you please explain the need to for this patch. The two patches above look good.