MemLeak Fixes
Merge branch 'MemLeakBusting'
Fixing Antoine's bugs.