Still more memory leak fixes