Continued fixes for Visual Studio 2008 32-bit builds.
Continued fixes for Visual Studio 2008 32-bit builds.