include more changes for x86_64