FIX Some memory leaks