Minor changes to support building with Visual Studio.