diff --git a/netbox/core/graphql/types.py b/netbox/core/graphql/types.py
index aeabf5310..013dcd416 100644
--- a/netbox/core/graphql/types.py
+++ b/netbox/core/graphql/types.py
@@ -15,8 +15,7 @@ __all__ = (
 
 @strawberry_django.type(
     models.DataFile,
-    # fields='__all__',
-    exclude=('data',),  # bug - temp
+    exclude=('data',),
     filters=DataFileFilter
 )
 class DataFileType(BaseObjectType):
diff --git a/netbox/extras/graphql/types.py b/netbox/extras/graphql/types.py
index f6c22c30d..efb2551ac 100644
--- a/netbox/extras/graphql/types.py
+++ b/netbox/extras/graphql/types.py
@@ -129,11 +129,11 @@ class CustomFieldType(ObjectType):
 
 @strawberry_django.type(
     models.CustomFieldChoiceSet,
-    # fields='__all__',
-    exclude=('extra_choices', ),  # bug - temp
+    fields='__all__',
     filters=CustomFieldChoiceSetFilter
 )
 class CustomFieldChoiceSetType(ObjectType):
+    extra_choices: List[List[str]]
 
     @strawberry_django.field
     def choices_for(self) -> List[Annotated["CustomFieldType", strawberry.lazy('extras.graphql.types')]]:
@@ -202,7 +202,7 @@ class SavedFilterType(ObjectType):
 
 @strawberry_django.type(
     models.Tag,
-    exclude=['extras_taggeditem_items', 'color'],  # bug - remove color from exclude
+    exclude=['extras_taggeditem_items', ],
     filters=TagFilter
 )
 class TagType(ObjectType):
diff --git a/netbox/ipam/graphql/filters.py b/netbox/ipam/graphql/filters.py
index dcc3ce4bf..a47f5adf5 100644
--- a/netbox/ipam/graphql/filters.py
+++ b/netbox/ipam/graphql/filters.py
@@ -31,7 +31,6 @@ class ASNFilter(BaseFilterMixin):
     pass
 
 
-# bug - fixme!
 @strawberry_django.filter(models.ASNRange, lookups=True)
 @autotype_decorator(filtersets.ASNRangeFilterSet)
 class ASNRangeFilter(BaseFilterMixin):
diff --git a/netbox/tenancy/graphql/types.py b/netbox/tenancy/graphql/types.py
index 90c35d47e..83655c534 100644
--- a/netbox/tenancy/graphql/types.py
+++ b/netbox/tenancy/graphql/types.py
@@ -137,11 +137,11 @@ class TenantType(NetBoxObjectType):
 
 @strawberry_django.type(
     models.TenantGroup,
-    # fields='__all__',
-    exclude=('parent',),  # bug - temp
+    fields='__all__',
     filters=TenantGroupFilter
 )
 class TenantGroupType(OrganizationalObjectType):
+    parent: Annotated["TenantGroupType", strawberry.lazy('tenancy.graphql.types')] | None
 
     @strawberry_django.field
     def tenants(self) -> List[TenantType]:
@@ -172,11 +172,11 @@ class ContactRoleType(ContactAssignmentsMixin, OrganizationalObjectType):
 
 @strawberry_django.type(
     models.ContactGroup,
-    # fields='__all__',
-    exclude=('parent',),  # bug - temp
+    fields='__all__',
     filters=ContactGroupFilter
 )
 class ContactGroupType(OrganizationalObjectType):
+    parent: Annotated["ContactGroupType", strawberry.lazy('tenancy.graphql.types')] | None
 
     @strawberry_django.field
     def contacts(self) -> List[ContactType]:
diff --git a/netbox/wireless/graphql/types.py b/netbox/wireless/graphql/types.py
index babffba83..e333d2bcf 100644
--- a/netbox/wireless/graphql/types.py
+++ b/netbox/wireless/graphql/types.py
@@ -16,11 +16,11 @@ __all__ = (
 
 @strawberry_django.type(
     models.WirelessLANGroup,
-    # fields='__all__',
-    exclude=('parent',),  # bug - temp
+    fields='__all__',
     filters=WirelessLANGroupFilter
 )
 class WirelessLANGroupType(OrganizationalObjectType):
+    parent: Annotated["WirelessLANGroupType", strawberry.lazy('wireless.graphql.types')] | None
 
     @strawberry_django.field
     def wireless_lans(self) -> List[Annotated["WirelessLANType", strawberry.lazy('wireless.graphql.types')]]: