Upgrade to latest core