Fix UUIDs