some more fixes on allocator