First update in a try to get this compiling with vs2012 only