Possibly fixed all network-related bugs