Fixes for Visual Studio 2008 32-bit build.
Continued fixes for Visual Studio 2008 32-bit build.