repair some breakage.