Fix network dependency issues