x86_64 fixing