Selecting Repair Boundaries