more leak fixes