VS2013 and fixes