More changes for VS 2010.

Signed-off-by: Eric Taucher <Researcher0x00@gmail.com>