Changes to build on VS 2012
Changes to build on VS 2012