More changes to better accommedate MSVC2012.