Repair UUID support