additional id fixes