Fixed assumptions.
There is more to 32-bit than x86...