More changes to 21264