Fix network api calls