- Merge fixes (build fix and memleak)