fixes for VS 2010