Decreased memory leaks