More work on fixing x86 vs x64
More work on fixing x86 vs x64
More work on fixing x86 vs x64