changes to repairers to try avoid cluster fuck battles