More allocator improvements