Fix more connection leaks