-Fixed compiling in VS2012 and above