Let's track down the SP repair stuff