Some more edits on Allocator