More repair-related goodness