Repair bot and another cargo fix.