diff --git a/bluetooth.te b/bluetooth.te
index 8ba56b0..56fe170 100644
--- a/bluetooth.te
+++ b/bluetooth.te
@@ -54,6 +54,7 @@
 auditallow bluetooth {
     service_manager_type
     -bluetooth_service
+    -radio_service
     -system_server_service
 }:service_manager find;
 
diff --git a/drmserver.te b/drmserver.te
index 12e3ac7..14b2f49 100644
--- a/drmserver.te
+++ b/drmserver.te
@@ -49,4 +49,8 @@
 
 # Audited locally.
 service_manager_local_audit_domain(drmserver)
-auditallow drmserver { service_manager_type -drmserver_service }:service_manager find;
+auditallow drmserver {
+    service_manager_type
+    -drmserver_service
+    -system_server_service
+}:service_manager find;
diff --git a/dumpstate.te b/dumpstate.te
index 279fd98..242cb93 100644
--- a/dumpstate.te
+++ b/dumpstate.te
@@ -96,3 +96,18 @@
 # Read network state info files.
 allow dumpstate net_data_file:dir search;
 allow dumpstate net_data_file:file r_file_perms;
+
+service_manager_local_audit_domain(dumpstate)
+auditallow dumpstate {
+    service_manager_type
+    -drmserver_service
+    -healthd_service
+    -inputflinger_service
+    -keystore_service
+    -mediaserver_service
+    -nfc_service
+    -radio_service
+    -surfaceflinger_service
+    -system_app_service
+    -system_server_service
+}:service_manager find;
diff --git a/isolated_app.te b/isolated_app.te
index 27b0e40..5929b25 100644
--- a/isolated_app.te
+++ b/isolated_app.te
@@ -21,4 +21,9 @@
 
 # Audited locally.
 service_manager_local_audit_domain(isolated_app)
-auditallow isolated_app service_manager_type:service_manager find;
+auditallow isolated_app {
+    service_manager_type
+    -radio_service
+    -surfaceflinger_service
+    -system_server_service
+}:service_manager find;
diff --git a/nfc.te b/nfc.te
index c32e9d5..2b851a2 100644
--- a/nfc.te
+++ b/nfc.te
@@ -21,5 +21,6 @@
 auditallow nfc {
     service_manager_type
     -mediaserver_service
+    -surfaceflinger_service
     -system_server_service
 }:service_manager find;
diff --git a/radio.te b/radio.te
index 11691cb..5f45df3 100644
--- a/radio.te
+++ b/radio.te
@@ -35,5 +35,6 @@
     service_manager_type
     -mediaserver_service
     -radio_service
+    -surfaceflinger_service
     -system_server_service
 }:service_manager find;
diff --git a/untrusted_app.te b/untrusted_app.te
index ef7f1b5..c97b451 100644
--- a/untrusted_app.te
+++ b/untrusted_app.te
@@ -69,6 +69,7 @@
 auditallow untrusted_app {
     service_manager_type
     -drmserver_service
+    -keystore_service
     -mediaserver_service
     -nfc_service
     -radio_service