Fix VC2013 issues