Fixed VS2013 compile and updated Core