put back calls
fixes for memory leaks