More fixes for 32-bit.
4 files changed