Repair and upgrades