Small fixes
Simplify internal allocator