Fix a few VC2008 problems