Fixed tool definitions