Fix errors and a warning reported by 32-bit MSVC.
2 files changed