Changes to re-enable building with Visual C++ 2010