Richer Repairs