Patch mem leaks
Resolve conflict / patch additional mem leak