diff --git a/debian/control b/debian/control
index be12d775508..275fa274765 100644
--- a/debian/control
+++ b/debian/control
@@ -86,7 +86,6 @@ Description: MariaDB database development files
 
 Package: libmariadb-dev-compat
 Architecture: any
-Multi-Arch: same
 Section: libdevel
 Depends: libmariadb-dev (= ${binary:Version}),
          ${misc:Depends}
@@ -950,7 +949,6 @@ Description: GSSAPI authentication plugin for MariaDB server
 
 Package: mariadb-plugin-gssapi-client
 Architecture: any
-Multi-Arch: same
 Depends: libgssapi-krb5-2,
          mariadb-client (= ${binary:Version}),
          ${misc:Depends},
diff --git a/debian/mariadb-server.logcheck.ignore.server b/debian/mariadb-server.logcheck.ignore.server
index a64fc54e15c..7db321a02d4 100644
--- a/debian/mariadb-server.logcheck.ignore.server
+++ b/debian/mariadb-server.logcheck.ignore.server
@@ -18,7 +18,7 @@ mysqld_safe\[[0-9]+\]: able to use the new GRANT command!$
 mysqld_safe\[[0-9]+\]: ended$
 mysqld_safe\[[0-9]+\]: NOTE:  If you are upgrading from a MySQL <= 3.22.10 you should run$
 mysqld_safe\[[0-9]+\]: PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !$
-mysqld_safe\[[0-9]+\]: Please report any problems at https://mariadb.org/jira$
+mysqld_safe\[[0-9]+\]: Please report any problems at https://jira.mariadb.org$
 mysqld_safe\[[0-9]+\]: See the manual for more instructions.$
 mysqld_safe\[[0-9]+\]: started$
 mysqld_safe\[[0-9]+\]: The latest information about MariaDB is available at$
diff --git a/debian/mariadb-server.logcheck.ignore.workstation b/debian/mariadb-server.logcheck.ignore.workstation
index a64fc54e15c..7db321a02d4 100644
--- a/debian/mariadb-server.logcheck.ignore.workstation
+++ b/debian/mariadb-server.logcheck.ignore.workstation
@@ -18,7 +18,7 @@ mysqld_safe\[[0-9]+\]: able to use the new GRANT command!$
 mysqld_safe\[[0-9]+\]: ended$
 mysqld_safe\[[0-9]+\]: NOTE:  If you are upgrading from a MySQL <= 3.22.10 you should run$
 mysqld_safe\[[0-9]+\]: PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !$
-mysqld_safe\[[0-9]+\]: Please report any problems at https://mariadb.org/jira$
+mysqld_safe\[[0-9]+\]: Please report any problems at https://jira.mariadb.org$
 mysqld_safe\[[0-9]+\]: See the manual for more instructions.$
 mysqld_safe\[[0-9]+\]: started$
 mysqld_safe\[[0-9]+\]: The latest information about MariaDB is available at$
diff --git a/debian/mariadb-server.postinst b/debian/mariadb-server.postinst
index bf7918de81f..28f3da309bc 100644
--- a/debian/mariadb-server.postinst
+++ b/debian/mariadb-server.postinst
@@ -150,7 +150,7 @@ EOF
     # The mysql_statedir must not be writable by the mysql user under any
     # circumstances as it contains scripts that are executed by root.
     set +e
-    chown -R 0:0 $mysql_statedir
+    find $mysql_statedir ! -uid 0 -print0 -or ! -gid 0 -print0 | xargs -0 -r sudo chown 0:0
     find $mysql_datadir ! -uid "$(id -u mysql)" -print0 | xargs -0 -r chown mysql
     chown -R mysql:adm $mysql_logdir
     chmod 2750 $mysql_logdir