more memory leak fixes
Fix: entity creation hit as a feature