Add missing checks on tools