And fix up some other copies of it too