Allocations various fixes