Mostly leak fixes, requires changes in internal method list structure