external id fixes