Fixes for Visual Studio 2005.