Updates to compile on windows with VS 2010.