Corrected support for 16-bit systems

We still need access to a 16-bit system to correctly test
these changes.
3 files changed