Allocator fixes