An assortment of leak fixes