More updates to work with VS 2010.

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