Improve intersection repair