adapt to firm Alloc changes