diff --git a/sonar/branches.py b/sonar/branches.py
index 14b4f7656..d093bd7bd 100644
--- a/sonar/branches.py
+++ b/sonar/branches.py
@@ -240,7 +240,7 @@ def export(self, export_settings: types.ConfigSettings) -> types.ObjectJsonRepr:
                 loc_distrib = {m.split("=")[0]: int(m.split("=")[1]) for m in lang_distrib.split(";")}
             loc_distrib["total"] = self.loc()
             data["ncloc"] = loc_distrib
-        if export_settings["MODE"] == "MIGRATION":
+        if export_settings.get("MODE", "") == "MIGRATION":
             tpissues = self.count_third_party_issues()
             issue_data = {"thirdParty": tpissues if len(tpissues) > 0 else 0}
             if self.endpoint.version() >= (10, 0, 0):
diff --git a/sonar/components.py b/sonar/components.py
index 952fdded7..e81385163 100644
--- a/sonar/components.py
+++ b/sonar/components.py
@@ -32,7 +32,7 @@
 import sonar.sqobject as sq
 import sonar.platform as pf
 
-from sonar import settings, tasks, measures, utilities, rules, issues
+from sonar import settings, tasks, measures, utilities, rules
 
 import sonar.audit.problem as pb
 
@@ -139,7 +139,7 @@ def get_issues(self, filters: types.ApiParams = None) -> dict[str, object]:
 
     def count_third_party_issues(self, filters: types.ApiParams = None) -> dict[str, int]:
         """Returns list of issues for a component, optionally on branches or/and PRs"""
-        from sonar.issues import component_filter
+        from sonar.issues import component_filter, count_by_rule
 
         third_party_rules = rules.third_party(self.endpoint)
         params = utilities.replace_keys(_ALT_COMPONENTS, component_filter(self.endpoint), self.search_params())
@@ -147,7 +147,7 @@ def count_third_party_issues(self, filters: types.ApiParams = None) -> dict[str,
             params.update(filters)
         params["facets"] = "rules"
         params["rules"] = [r.key for r in third_party_rules]
-        issues_count = {k: v for k, v in issues.count_by_rule(endpoint=self.endpoint, **params).items() if v > 0}
+        issues_count = {k: v for k, v in count_by_rule(endpoint=self.endpoint, **params).items() if v > 0}
         return issues_count
 
     def get_hotspots(self, filters: types.ApiParams = None) -> dict[str, object]: