Repair enhancements