Bunch more TAallocation changes