Rudimentary fix of vs2012 compile errors.