diff --git a/awx/api/generics.py b/awx/api/generics.py
index 2707bb9d4a..65ce0fde90 100644
--- a/awx/api/generics.py
+++ b/awx/api/generics.py
@@ -161,7 +161,7 @@ class APIView(views.APIView):
         '''
         ret = super(APIView, self).metadata(request)
         added_in_version = '1.2'
-        for version in ('2.4.0', '2.3.0', '2.2.0', '2.1.0', '2.0.0', '1.4.8', '1.4.5', '1.4', '1.3'):
+        for version in ('3.0.0', '2.4.0', '2.3.0', '2.2.0', '2.1.0', '2.0.0', '1.4.8', '1.4.5', '1.4', '1.3'):
             if getattr(self, 'new_in_%s' % version.replace('.', ''), False):
                 added_in_version = version
                 break
diff --git a/awx/main/migrations/0075_v300_changes.py b/awx/main/migrations/0075_v300_changes.py
index 6c9b74b414..db25caa1f2 100644
--- a/awx/main/migrations/0075_v300_changes.py
+++ b/awx/main/migrations/0075_v300_changes.py
@@ -554,4 +554,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['main']
\ No newline at end of file
+    complete_apps = ['main']
diff --git a/awx/main/signals.py b/awx/main/signals.py
index aebf2ac7ee..04a1cfa00a 100644
--- a/awx/main/signals.py
+++ b/awx/main/signals.py
@@ -321,7 +321,12 @@ def activity_stream_create(sender, instance, created, **kwargs):
             object1=object1,
             changes=json.dumps(model_to_dict(instance, model_serializer_mapping)))
         activity_entry.save()
-        getattr(activity_entry, object1).add(instance)
+        print("Instance: {}".format(instance))
+        #TODO: Weird situation where cascade SETNULL doesn't work
+        #      it might actually be a good idea to remove all of these FK references since
+        #      we don't really use them anyway.
+        if type(instance) is not TowerSettings:
+            getattr(activity_entry, object1).add(instance)
 
 def activity_stream_update(sender, instance, **kwargs):
     if instance.id is None:
@@ -348,7 +353,8 @@ def activity_stream_update(sender, instance, **kwargs):
         object1=object1,
         changes=json.dumps(changes))
     activity_entry.save()
-    getattr(activity_entry, object1).add(instance)
+    if type(instance) is not TowerSettings:
+        getattr(activity_entry, object1).add(instance)
 
 def activity_stream_delete(sender, instance, **kwargs):
     if not activity_stream_enabled: