Fix x64 issues