- More mem leak fixes