fixes from 64-bit compile
2 files changed