Add support for 32 and 64 bits on x86