Fix more memory leaks
More memory fixes