More repair improvements.