Internal/External ID's gefixt