diff --git a/apparmor.d/groups/apt/dpkg-preconfigure b/apparmor.d/groups/apt/dpkg-preconfigure
index 4dbfae0a8..716cd1dc8 100644
--- a/apparmor.d/groups/apt/dpkg-preconfigure
+++ b/apparmor.d/groups/apt/dpkg-preconfigure
@@ -30,7 +30,6 @@ profile dpkg-preconfigure @{exec_path} {
   @{bin}/head                  ix,
   @{bin}/locale                ix,
   @{bin}/readlink              ix,
-  @{bin}/readlink              ix,
   @{bin}/realpath              ix,
   @{bin}/sed                   ix,
   @{bin}/sort                  ix,
diff --git a/apparmor.d/groups/apt/dpkg-scripts b/apparmor.d/groups/apt/dpkg-scripts
index e18ab78de..4fb4d04c4 100644
--- a/apparmor.d/groups/apt/dpkg-scripts
+++ b/apparmor.d/groups/apt/dpkg-scripts
@@ -47,11 +47,11 @@ profile dpkg-scripts @{exec_path} {
   @{sbin}/update-rc.d                             Cx -> rc,
 
   # Maintainer scripts can legitimately start/restart anything
-  @{bin}/**                                       Px,
-  @{sbin}/**                                      Px,
-  @{lib}/**                                       Px,
-  /usr/share/**                                   Px,
-  /etc/init.d/*                                   Px,
+  @{bin}/**                                       PUx,
+  @{sbin}/**                                      PUx,
+  @{lib}/**                                       PUx,
+  /usr/share/**                                   PUx,
+  /etc/init.d/*                                   PUx,
 
   # Maintainer's scripts can update a lot of files
   / r,
@@ -76,9 +76,9 @@ profile dpkg-scripts @{exec_path} {
     include <abstractions/bus-system>
 
     dbus send bus=system path=/
-        interface=org.freedesktop.DBus
-        member=ReloadConfig
-        peer=(name=org.freedesktop.DBus, label="@{p_dbus_system}"),
+         interface=org.freedesktop.DBus
+         member=ReloadConfig
+         peer=(name=org.freedesktop.DBus, label="@{p_dbus_system}"),
 
     include if exists <local/dpkg-scripts_bus>
   }
diff --git a/apparmor.d/groups/browsers/firefox b/apparmor.d/groups/browsers/firefox
index 7d1be8442..a561954a3 100644
--- a/apparmor.d/groups/browsers/firefox
+++ b/apparmor.d/groups/browsers/firefox
@@ -39,7 +39,7 @@ profile firefox @{exec_path} flags=(attach_disconnected) {
   @{bin}/kreadconfig{,5}                             rPx,
   @{bin}/plasma-browser-integration-host             rPx,
   @{bin}/speech-dispatcher                           rPx,
-  @{sbin}/update-mime-database                       rPx,
+  @{bin}/update-mime-database                        rPx,
   @{lib}/gvfsd-metadata                              rPx,
   @{lib}/mozilla/kmozillahelper                     rPUx,
   @{open_path}                                       rPx -> child-open,
diff --git a/apparmor.d/groups/snap/snap b/apparmor.d/groups/snap/snap
index 8549d8315..562f49dca 100644
--- a/apparmor.d/groups/snap/snap
+++ b/apparmor.d/groups/snap/snap
@@ -85,8 +85,9 @@ profile snap @{exec_path} flags=(attach_disconnected) {
   @{sys}/fs/cgroup/cgroup.controllers r,
   @{sys}/kernel/security/apparmor/features/{,**} r,
 
-        @{PROC}/@{pids}/cgroup r,
-        @{PROC}/@{pids}/mountinfo r,
+        @{PROC}/@{pid}/cgroup r,
+        @{PROC}/@{pid}/maps r,
+        @{PROC}/@{pid}/mountinfo r,
         @{PROC}/cgroups r,
         @{PROC}/cmdline r,
         @{PROC}/sys/kernel/random/uuid r,
diff --git a/apparmor.d/groups/snap/snapd b/apparmor.d/groups/snap/snapd
index 0eb3adb8c..0481af5de 100644
--- a/apparmor.d/groups/snap/snapd
+++ b/apparmor.d/groups/snap/snapd
@@ -208,6 +208,8 @@ profile snapd @{exec_path} {
 
     network netlink raw,
 
+    signal receive set=kill peer=snapd,
+
     @{bin}/journalctl mr,
 
     /etc/machine-id r,
diff --git a/apparmor.d/profiles-s-z/which b/apparmor.d/profiles-s-z/which
index cc95a17f9..df049741f 100644
--- a/apparmor.d/profiles-s-z/which
+++ b/apparmor.d/profiles-s-z/which
@@ -7,7 +7,7 @@ abi <abi/4.0>,
 
 include <tunables/global>
 
-@{exec_path} = @{bin}/which{.debianutils,}
+@{exec_path} = @{bin}/which{,.debianutils}
 profile which @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/consoles>
diff --git a/apparmor.d/profiles-s-z/whiptail b/apparmor.d/profiles-s-z/whiptail
index a7b98ebee..f0efad77b 100644
--- a/apparmor.d/profiles-s-z/whiptail
+++ b/apparmor.d/profiles-s-z/whiptail
@@ -8,7 +8,7 @@ abi <abi/4.0>,
 include <tunables/global>
 
 @{exec_path} = @{bin}/whiptail
-profile whiptail @{exec_path} flags=(complain) {
+profile whiptail @{exec_path} {
   include <abstractions/base>
   include <abstractions/consoles>
 
@@ -16,9 +16,7 @@ profile whiptail @{exec_path} flags=(complain) {
 
   @{exec_path} mr,
 
-  /etc/newt/palette.* r,
-
-  owner @{tmp}/gpm* w,
+  /usr/share/terminfo/** r,
 
   include if exists <local/whiptail>
 }