Fixes for MSVC6
(cherry picked from commit 7a2538ee38f6fde58bc6d3eb45624a5ac8eeaa30)
2 files changed