Fix trip IDs