Leak fixes.