Fix the network issue but leaving the issue open for general cleanup

See title.