fix up lazy tools as well