Small VS2013 fixes