More leak fixes, not 100% yet