More x64 fixes