Fixing build issues on Windows 8.1 using VS 2010