Fix x64 more.