Repair recent changes