Fix more i variable leaks