Adds more checking for 32-bit vs 64-bit