Memory leak fixes from Jonas Koelker.