more id fixes