First round of leak cleanups
More leak fixes