Merge x86-64 update from Andi