Fix more leaks