more leak fixes.