Updates to allow compilation under Win8.1 VS2013 x64