Leak fixes