Organic, fix memory leaks