Trump now says GM 'doing a fantastic job’ after Friday threat