Fixed build issues in Visual C++ 2010 Express