Repair some stuff