diff --git a/app/policies/map_policy.rb b/app/policies/map_policy.rb
index 2cdbdee2..671eea83 100644
--- a/app/policies/map_policy.rb
+++ b/app/policies/map_policy.rb
@@ -43,6 +43,6 @@ class MapPolicy < ApplicationPolicy
   end
 
   def destroy?
-    record.user == user || user.admin
+    record.user == user || admin_override
   end
 end
diff --git a/app/policies/synapse_policy.rb b/app/policies/synapse_policy.rb
index 6d332fbf..6763014a 100644
--- a/app/policies/synapse_policy.rb
+++ b/app/policies/synapse_policy.rb
@@ -10,16 +10,14 @@ class SynapsePolicy < ApplicationPolicy
   end
 
   def show?
-    # record.permission == 'commons' || record.permission == 'public' || record.user == user
-    true
+    record.permission == 'commons' || record.permission == 'public' || record.user == user
   end
 
   def update?
-    # user.present? && (record.permission == 'commons' || record.user == user)
-    true
+    user.present? && (record.permission == 'commons' || record.user == user)
   end
 
   def destroy?
-    record.user == user || user.admin
+    record.user == user || admin_override
   end
 end
diff --git a/app/policies/topic_policy.rb b/app/policies/topic_policy.rb
index 55e79c2d..03b42895 100644
--- a/app/policies/topic_policy.rb
+++ b/app/policies/topic_policy.rb
@@ -14,12 +14,11 @@ class TopicPolicy < ApplicationPolicy
   end
 
   def update?
-    # user.present? && (record.permission == 'commons' || record.user == user)
-    true
+    user.present? && (record.permission == 'commons' || record.user == user)
   end
 
   def destroy?
-    record.user == user || user.admin
+    record.user == user || admin_override
   end
 
   def autocomplete_topic?