Fix up IDs