diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..01f7262a
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+Maria Matejka <mq@ucw.cz>
+Maria Matejka <mq@jmq.cz>
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ecdc3d35..8651b145 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -90,7 +90,10 @@ The credits are scattered over all the source code files; in the commentary
 section, you may find typically the original authors of these files or some
 major contributors who felt like adding their names there. Overall, if you feel
 like your name should be there, include this change in your commits please.
-If your name should be changed, please do that change there.
+
+If your name should be changed, please do that change in the source code files.
+If your name should be changed in the displayed git commit author / commiter
+logs, please submit a patch on the `.mailmap` file.
 
 We are planning to centralize the credits one day; we'll then update this file
 accordingly.
diff --git a/configure.ac b/configure.ac
index 25e1b159..e086019f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,7 +114,7 @@ AC_SEARCH_LIBS([clock_gettime], [rt posix4],
 AC_CANONICAL_HOST
 
 # Store this value because ac_test_CFLAGS is overwritten by AC_PROG_CC
-if test "$ac_test_CFLAGS" != set ; then
+if ! test "$ac_test_CFLAGS" ; then
   bird_cflags_default=yes
 fi
 
diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c
index a01e5a23..8f26c639 100644
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@ -611,7 +611,6 @@ static void
 cli_init_unix(uid_t use_uid, gid_t use_gid)
 {
   ASSERT_DIE(main_control_socket_config == NULL);
-  cli_init();
 
   main_control_socket_config = &initial_control_socket_config;
   main_control_socket_config->uid = use_uid;
@@ -626,6 +625,9 @@ cli_init_unix(uid_t use_uid, gid_t use_gid)
 static void
 cli_preconfig(struct config *c)
 {
+  if (!main_control_socket_config)
+    return;
+
   struct cli_config *ccf = mb_alloc(cli_pool, sizeof *ccf);
   memcpy(ccf, main_control_socket_config, sizeof *ccf);
   ccf->n = (struct cli_config_node) {};
@@ -1028,6 +1030,8 @@ main(int argc, char **argv)
   uid_t use_uid = get_uid(use_user);
   gid_t use_gid = get_gid(use_group);
 
+  cli_init();
+
   if (!parse_and_exit)
   {
     test_old_bird(path_control_socket);