Fix-up the whole x86/x86_64 mess

Signed-off-by: Alec Ari <neotheuser@ymail.com>