franky fixes some memory leaks