leak fixes