diff --git a/man/coredumpctl.xml b/man/coredumpctl.xml
index c6b0f142bc..1f880d7f70 100644
--- a/man/coredumpctl.xml
+++ b/man/coredumpctl.xml
@@ -299,6 +299,18 @@
     </para>
   </refsect1>
 
+  <refsect1>
+    <title>Environment</title>
+
+    <variablelist class='environment-variables'>
+      <varlistentry>
+        <term><varname>$SYSTEMD_DEBUGGER</varname></term>
+        <listitem><para>Use the given debugger for the <command>debug</command>
+        command. See the <option>--debugger=</option> option.</para></listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
   <refsect1>
     <title>Examples</title>
 
diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index 3166145b33..2bf0f4f86d 100644
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -1322,8 +1322,8 @@ int terminal_urlify_path(const char *path, const char *text, char **ret) {
 
         assert(path);
 
-        /* Much like terminal_urlify() above, but takes a file system path as input, and turns it into a properl
-         * file:// URL first. */
+        /* Much like terminal_urlify() above, but takes a file system path as input
+         * and turns it into a proper file:// URL first. */
 
         if (isempty(path))
                 return -EINVAL;
diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index 6b4acd4e80..7c5fafcf8a 100644
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -97,8 +97,8 @@ static int load_user_database(void) {
                 return r;
 
         while ((r = fgetpwent_sane(f, &pw)) > 0) {
-                int k, q;
                 char *n;
+                int k, q;
 
                 n = strdup(pw->pw_name);
                 if (!n)
@@ -117,7 +117,7 @@ static int load_user_database(void) {
                         return q;
                 }
 
-                if (q <= 0 && k <= 0)
+                if (k <= 0 && q <= 0)
                         free(n);
         }
         return r;
@@ -164,7 +164,7 @@ static int load_group_database(void) {
                         return q;
                 }
 
-                if (q <= 0 && k <= 0)
+                if (k <= 0 && q <= 0)
                         free(n);
 
                 errno = 0;