Repairing Geometry