More mem leaks fixed