Windows build fixes (VS2010).