Changes to compile for vs2013/vs12