A good thing to have, when doing jobs like this, is a set of thread chasers, both for threads and bolts, it will make your life a lot easier and avoid grief in the future! You want to clean up those threads where you have to cut them.
Good for you changing them before they leaked and ruined an...