More allocator optimization