Change i686 to x86 and x86_64 to x64 properly