Advanced UUID correction