Fix more network bugs