repair some breakage