More memory leak fixes
Merge branch 'NewLevels'