Fix some other momory leaks