Switch from using x64 to x86-64
Improve OS detection