more 64-bit fixes
2 files changed