Fix one of the memory leak fixes
Fix more memory leaks
More memory fixes