Fix leaks some more.