Minor updates to the base allocator w/ fallback