Fix leaks I introduced by fixing others