Correct types using for both 32 bit and 64 bit architectures