Correct types using for 32 bit and 64 bit architectures