diff --git a/awx/main/migrations/_rbac.py b/awx/main/migrations/_rbac.py
index 77b1f5e2b8..23b4153b7c 100644
--- a/awx/main/migrations/_rbac.py
+++ b/awx/main/migrations/_rbac.py
@@ -238,7 +238,7 @@ def migrate_projects(apps, schema_editor):
         original_project_name = project.name
         project_orgs = project.deprecated_organizations.distinct().all()
 
-        if project_orgs.count() > 1:
+        if len(project_orgs) > 1:
             first_org = None
             for org in project_orgs:
                 if first_org is None:
diff --git a/awx/main/models/rbac.py b/awx/main/models/rbac.py
index b1f3ca0a57..a8b2b58210 100644
--- a/awx/main/models/rbac.py
+++ b/awx/main/models/rbac.py
@@ -136,11 +136,8 @@ class Role(CommonModelNameNotUnique):
 
     @staticmethod
     def singleton(name):
-        try:
-            return Role.objects.get(singleton_name=name)
-        except Role.DoesNotExist:
-            ret = Role.objects.create(singleton_name=name, name=name)
-            return ret
+        role, _ = Role.objects.get_or_create(singleton_name=name, name=name)
+        return role
 
     def is_ancestor_of(self, role):
         return role.ancestors.filter(id=self.id).exists()