More x86_64 fixes