Safety-Focused Repairs