Extended Allocation fixes