diff --git a/apparmor.d/groups/gnome/nautilus b/apparmor.d/groups/gnome/nautilus
index 74732511..e477d810 100644
--- a/apparmor.d/groups/gnome/nautilus
+++ b/apparmor.d/groups/gnome/nautilus
@@ -32,7 +32,6 @@ profile nautilus @{exec_path} flags=(attach_disconnected) {
 
   # Silencer for non user's data
   deny /boot rw,
-  # deny /var rw,
   deny /opt rw,
   deny /root rw,
   deny /tmp/.* rw,
diff --git a/apparmor.d/groups/gvfs/gvfsd-archive b/apparmor.d/groups/gvfs/gvfsd-archive
index b9d4ef0c..4b8b3891 100644
--- a/apparmor.d/groups/gvfs/gvfsd-archive
+++ b/apparmor.d/groups/gvfs/gvfsd-archive
@@ -18,12 +18,12 @@ profile gvfsd-archive @{exec_path} {
   owner @{HOME}/**.{tar,tar.gz,zip} r,
   owner /media/**.{TAR,TAR.GZ,ZIP} r,
   owner @{HOME}/**.{tar,tar.gz,zip} r,
-  owner /media/**.{TAR,TAR.GZ,ZIP} r,
+  owner /mnt/**.{TAR,TAR.GZ,ZIP} r,
 
   owner @{HOME}/**.{iso,img,bin,mdf,nrg} r,
   owner /media/*/**.{iso,img,bin,mdf,nrg} r,
   owner @{HOME}/**.{ISO,IMG,BIN,MDF,NRG} r,
-  owner /media/*/**.{ISO,IMG,BIN,MDF,NRG} r,
+  owner /mnt/*/**.{ISO,IMG,BIN,MDF,NRG} r,
 
   include if exists <local/gvfsd-archive>
 }
diff --git a/apparmor.d/groups/systemd/coredumpctl b/apparmor.d/groups/systemd/coredumpctl
index 650e615a..5cffdc1f 100644
--- a/apparmor.d/groups/systemd/coredumpctl
+++ b/apparmor.d/groups/systemd/coredumpctl
@@ -1,13 +1,6 @@
-# vim:syntax=apparmor
-# ------------------------------------------------------------------
-#
-#    Copyright (C) 2021 Mikhail Morfikov
-#
-#    This program is free software; you can redistribute it and/or
-#    modify it under the terms of version 2 of the GNU General Public
-#    License published by the Free Software Foundation.
-#
-# ------------------------------------------------------------------
+# apparmor.d - Full set of apparmor profiles
+# Copyright (C) 2021 Mikhail Morfikov
+# SPDX-License-Identifier: GPL-2.0-only
 
 abi <abi/3.0>,
 
diff --git a/apparmor.d/groups/systemd/systemd-coredump b/apparmor.d/groups/systemd/systemd-coredump
index cab3a6b1..2127362d 100644
--- a/apparmor.d/groups/systemd/systemd-coredump
+++ b/apparmor.d/groups/systemd/systemd-coredump
@@ -1,13 +1,6 @@
-# vim:syntax=apparmor
-# ------------------------------------------------------------------
-#
-#    Copyright (C) 2021 Mikhail Morfikov
-#
-#    This program is free software; you can redistribute it and/or
-#    modify it under the terms of version 2 of the GNU General Public
-#    License published by the Free Software Foundation.
-#
-# ------------------------------------------------------------------
+# apparmor.d - Full set of apparmor profiles
+# Copyright (C) 2021 Mikhail Morfikov
+# SPDX-License-Identifier: GPL-2.0-only
 
 abi <abi/3.0>,
 
diff --git a/apparmor.d/groups/systemd/systemd-resolved b/apparmor.d/groups/systemd/systemd-resolved
index 1332d943..4818ed59 100644
--- a/apparmor.d/groups/systemd/systemd-resolved
+++ b/apparmor.d/groups/systemd/systemd-resolved
@@ -3,8 +3,6 @@
 #               2021 Alexandre Pujol <alexandre@pujol.io>
 # SPDX-License-Identifier: GPL-3.0-only
 
-# Version of program profiled: 247.3
-
 abi <abi/3.0>,
 include <tunables/global>
 
@@ -14,7 +12,6 @@ profile systemd-resolved @{exec_path} {
   include <abstractions/nameservice-strict>
   include <abstractions/p11-kit>
   include <abstractions/ssl_certs>
-  # include <abstractions/krathalans-networking>
 
   capability net_bind_service,
   capability net_raw,