Starting to fix memory leaks