[Fix and Opt] Removed some more objects allocations