Some x86_64 related modification