Fix tools autodiscovery