yet another round of memleak fixes