64-bit fixes
3 files changed