Compilation fixes for VS2010.
Compilation fixes for VS2010.