More work on block allocator