Make last commit compileable in VS2010